Autogenerated HTML docs for v1.5.6.2-212-g08b5
diff --git a/git-checkout.html b/git-checkout.html index 8765bef..22230f0 100644 --- a/git-checkout.html +++ b/git-checkout.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-checkout(1)</title> </head> @@ -276,15 +324,15 @@ <div class="content"><em>git checkout</em> [-q] [-f] [[--track | --no-track] -b <new_branch> [-l]] [-m] [<branch>] <em>git checkout</em> [<tree-ish>] <paths>…</div></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>When <paths> are not given, this command switches branches by +<div class="para"><p>When <paths> are not given, this command switches branches by updating the index and working tree to reflect the specified branch, <branch>, and updating HEAD to be <branch> or, if specified, <new_branch>. Using -b will cause <new_branch> to be created; in this case you can use the --track or --no-track -options, which will be passed to <tt>git branch</tt>.</p> -<p>When <paths> are given, this command does <strong>not</strong> switch +options, which will be passed to <tt>git branch</tt>.</p></div> +<div class="para"><p>When <paths> are given, this command does <strong>not</strong> switch branches. It updates the named paths in the working tree from the index file (i.e. it runs <tt>git checkout-index -f -u</tt>), or from a named commit. In @@ -292,11 +340,11 @@ either of them results in an error. <tree-ish> argument can be used to specify a specific tree-ish (i.e. commit, tag or tree) to update the index for the given paths before updating the -working tree.</p> +working tree.</p></div> </div> -<h2>OPTIONS</h2> +<h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> -q </dt> @@ -333,14 +381,14 @@ </dt> <dd> <p> - When creating a new branch, set up configuration so that <tt>git-pull</tt> + When creating a new branch, set up configuration so that <em>git-pull</em> will automatically retrieve data from the start point, which must be a branch. Use this if you always pull from the same upstream branch into the new branch, and if you don't want to use "git pull <repository> <refspec>" explicitly. This behavior is the default when the start point is a remote branch. Set the branch.autosetupmerge configuration variable to <tt>false</tt> if you want - <tt>git-checkout</tt> and <tt>git-branch</tt> to always behave as if <em>--no-track</em> were + <em>git-checkout</em> and <em>git-branch</em> to always behave as if <em>--no-track</em> were given. Set it to <tt>always</tt> if you want this behavior when the start-point is either a local or remote branch. </p> @@ -376,10 +424,10 @@ branch, your working tree contents, and the new branch is done, and you will be on the new branch. </p> -<p>When a merge conflict happens, the index entries for conflicting +<div class="para"><p>When a merge conflict happens, the index entries for conflicting paths are left unmerged, and you need to resolve the conflicts and mark the resolved paths with <tt>git add</tt> (or <tt>git rm</tt> if the merge -should result in deletion of the path).</p> +should result in deletion of the path).</p></div> </dd> <dt> <new_branch> @@ -397,46 +445,46 @@ Branch to checkout; may be any object ID that resolves to a commit. Defaults to HEAD. </p> -<p>When this parameter names a non-branch (but still a valid commit object), -your HEAD becomes <em>detached</em>.</p> +<div class="para"><p>When this parameter names a non-branch (but still a valid commit object), +your HEAD becomes <em>detached</em>.</p></div> </dd> -</dl> +</dl></div> </div> -<h2>Detached HEAD</h2> +<h2 id="_detached_head">Detached HEAD</h2> <div class="sectionbody"> -<p>It is sometimes useful to be able to <em>checkout</em> a commit that is +<div class="para"><p>It is sometimes useful to be able to <em>checkout</em> a commit that is not at the tip of one of your branches. The most obvious example is to check out the commit at a tagged official release -point, like this:</p> +point, like this:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git checkout v2.6.18</tt></pre> </div></div> -<p>Earlier versions of git did not allow this and asked you to +<div class="para"><p>Earlier versions of git did not allow this and asked you to create a temporary branch using <tt>-b</tt> option, but starting from version 1.5.0, the above command <em>detaches</em> your HEAD from the current branch and directly point at the commit named by the tag -(<tt>v2.6.18</tt> in the above example).</p> -<p>You can use usual git commands while in this state. You can use +(<tt>v2.6.18</tt> in the above example).</p></div> +<div class="para"><p>You can use usual git commands while in this state. You can use <tt>git reset --hard $othercommit</tt> to further move around, for example. You can make changes and create a new commit on top of a detached HEAD. You can even create a merge by using <tt>git -merge $othercommit</tt>.</p> -<p>The state you are in while your HEAD is detached is not recorded +merge $othercommit</tt>.</p></div> +<div class="para"><p>The state you are in while your HEAD is detached is not recorded by any branch (which is natural --- you are not on any branch). What this means is that you can discard your temporary commits and merges by switching back to an existing branch (e.g. <tt>git checkout master</tt>), and a later <tt>git prune</tt> or <tt>git gc</tt> would garbage-collect them. If you did this by mistake, you can ask -the reflog for HEAD where you were, e.g.</p> +the reflog for HEAD where you were, e.g.</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git log -g -2 HEAD</tt></pre> </div></div> </div> -<h2>EXAMPLES</h2> +<h2 id="_examples">EXAMPLES</h2> <div class="sectionbody"> -<ol> +<div class="olist"><ol> <li> <p> The following sequence checks out the <tt>master</tt> branch, reverts @@ -450,7 +498,7 @@ $ rm -f hello.c $ git checkout hello.c <b>(3)</b></tt></pre> </div></div> -<ol> +<div class="colist"><ol> <li> <p> switch branch @@ -465,15 +513,15 @@ <p> restore hello.c from HEAD of current branch </p> -<p>If you have an unfortunate branch that is named <tt>hello.c</tt>, this +<div class="para"><p>If you have an unfortunate branch that is named <tt>hello.c</tt>, this step would be confused as an instruction to switch to that branch. -You should instead write:</p> +You should instead write:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git checkout -- hello.c</tt></pre> </div></div> </li> -</ol> +</ol></div> </li> <li> <p> @@ -484,24 +532,24 @@ <div class="content"> <pre><tt>$ git checkout mytopic</tt></pre> </div></div> -<p>However, your "wrong" branch and correct "mytopic" branch may +<div class="para"><p>However, your "wrong" branch and correct "mytopic" branch may differ in files that you have locally modified, in which case, -the above checkout would fail like this:</p> +the above checkout would fail like this:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git checkout mytopic fatal: Entry 'frotz' not uptodate. Cannot merge.</tt></pre> </div></div> -<p>You can give the <tt>-m</tt> flag to the command, which would try a -three-way merge:</p> +<div class="para"><p>You can give the <tt>-m</tt> flag to the command, which would try a +three-way merge:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git checkout -m mytopic Auto-merging frotz</tt></pre> </div></div> -<p>After this three-way merge, the local modifications are _not_ +<div class="para"><p>After this three-way merge, the local modifications are <em>not</em> registered in your index file, so <tt>git diff</tt> would show you what -changes you made since the tip of the new branch.</p> +changes you made since the tip of the new branch.</p></div> </li> <li> <p> @@ -516,33 +564,33 @@ ERROR: Merge conflict in frotz fatal: merge program failed</tt></pre> </div></div> -<p>At this point, <tt>git diff</tt> shows the changes cleanly merged as in +<div class="para"><p>At this point, <tt>git diff</tt> shows the changes cleanly merged as in the previous example, as well as the changes in the conflicted files. Edit and resolve the conflict and mark it resolved with -<tt>git add</tt> as usual:</p> +<tt>git add</tt> as usual:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ edit frotz $ git add frotz</tt></pre> </div></div> </li> -</ol> +</ol></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Linus Torvalds <torvalds@osdl.org></p> +<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org></p></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p> +<div class="para"><p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:01:34 UTC +Last updated 2008-07-06 05:16:37 UTC </div> </div> </body> 